pass NULL to gtk_tree_model_rows_reordered and not an iter with user_data

Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
        gtk_tree_model_rows_reordered and not an iter with user_data
        set to NULL (which is an invalid liststore iter, so
        iter_n_children failed, etc)

diff --git a/ChangeLog b/ChangeLog
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8998f80facbe214d613ff4b830ef8445cc8396c6..c1e13fd827bcb7a102f07f49ddab97efe3ebed3d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jan  9 21:31:44 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to
+       gtk_tree_model_rows_reordered and not an iter with user_data
+       set to NULL (which is an invalid liststore iter, so
+       iter_n_children failed, etc)
+
 2002-01-09  Sven Neumann  <sven@gimp.org>
 
        * tests/prop-editor.c: declared internal functions static.

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 502dae564bdb9db067803d16454e5b5381cd2eb8..9b95a757ec9d9c9a9e8c6dc0e863e232b0b7693c 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1567,7 +1567,6 @@ gtk_list_store_compare_func (gconstpointer a,
 static void
 gtk_list_store_sort (GtkListStore *list_store)
 {
-  GtkTreeIter iter;
   GArray *sort_array;
   gint i;
   gint *new_order;
@@ -1611,11 +1610,10 @@ gtk_list_store_sort (GtkListStore *list_store)
   new_order = g_new (gint, list_store->length);
   for (i = 0; i < list_store->length; i++)
     new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
+
   path = gtk_tree_path_new ();
-  iter.stamp = list_store->stamp;
-  iter.user_data = NULL;
   gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
-                                path, &iter, new_order);
+                                path, NULL, new_order);
   gtk_tree_path_free (path);
   g_free (new_order);
   g_array_free (sort_array, TRUE);